Revert "bandaid for compiler"

This reverts commit 79b9fa310c6abc3aed3d3c4bd89ab05c30ddd1b8.