Backout 3225c78eb19b (Bug 842920) to remove temporary fix. a=Standard8