Back out bug 916257 on a CLOSED TREE (DONTBUILD)