Revert "Build fix"

This reverts commit 09ed72871912fe6a100fabf3b6bc2d534b59a1b8.