Revert "gcc improvments"

This reverts commit a03906519aa50e7c192a41031248cdb93f80442a.