revert change that breaks gcc build