I don't understand why you're taking this out. From the description on bugzilla it sounded like the fix was just to compare explicitly for null so that a restoreTime of 0 was not treated as null.