Back out c0c410aed86f (bug 979133) for -wError bustage
CLOSED TREE