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