Backout 945662d34d67 (Bug 842918) to remove temporary fix.