Backed out changeset 3540ecf33808 / bug 1003029 due to test failures.