Revert "workaround for compile error"

This reverts commit d5195c6f644027d3c71751e4cb40811a65224e55.