While I'm here merge r519240, it fixes build on GCC architectures and also removes base GCC workaround.