Reverting this for now till we figure out how to avoid the build breakage. This reverts commit fa98798b63.
fa98798b63