revert r24851, it breaks compilation on many hosts