backout 9f044f9e981a (Bug 842389) due to page correctness regression bug 843997.