Backout 524be0420e79 and 4c39a7047e96:b3d04b01c319 (bug 952777) for build bustage that led to this CLOSED TREE