REVERT: gcc fix