Back out bug 935692 on this CLOSED TREE due to warnings-as-errors bustage.