Revert "Reverting change that broke builds."

This reverts commit fbf7cf7976ecd0748bfbc17d27f20e558ae5bf6a.