Revert commit r207302 since build failures
have been reported.