This reverts commit 8a3f9a58. need to investigate build failures that do not show on CI or local testing.