[build] Partially revert 90904fa9dd96b65944ae402a12ccb81e681b5d44.

Alan, you forgot to push that commit.