backout e9c0d692b2cf (bug 970494) for warning failures. r=backout
CLOSED TREE