Revert "Work-around bug in GCC 4.4.5"