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