Backed out changeset 5f1f5cec84c2 (bug 1068732)
Backed out changeset 312fff745e10 DONTBUILD