Bug 1023353 - back out merge day change.