backout 99c93cc91750 (Bug 842389) due to page correctness regression bug 843997. a=lsblakk