Bug 1037541 - Follow-up for stupid error in supposedly-safe last-minute change