Backed out changeset 028c7e956140 (bug 1046382) since we're not taking it on Fx32 after all.
DONTBUILD