Revert "Fix compiler issue"

This reverts commit 14ef2ea982f97135ead0f1cf7c2262a10c4f93ee.