Reverting change that broke builds.