Backed out changesets 950a3afc2b15 and dfb5303af6f9 (bug 1028288) for being incorrect