I had inconsistent experience with this. I am also a procrastinator, I found that one leg of the trip they didn't care or ask, but on the way back they made a fuss over it. Possibly I could have spent more of my time arguing with them, but luckily I also had my not-expired passport so just moved along.