Revert r94355 because it caused bunch of builds to break.