Backed out changeset 0593679c47a9 (bug 894099) because it causes bug 897901. DONTBUILD