r18754: Get rid of some more invalid time sets