Backout 14dc29b1586b (bug 963024) for landing only part of the patch; DONTBUILD because NPOTB