Reverting change which gcc 4.4 didn't like