Backed out changesets b093ba2c7ff9 and 0acbd06d48a9 (Bug 836655) for failing unit test.