This reverts commit 6db6ab4815a44bfcaabfcdd84a0ff458394f6f52 which reverts D148536. Build issues addressed in D148698.