This was due a wrong revert done on 40465600. Checked on x86_64-linux-gnu and i686-linux-gnu. (cherry picked from commit f27e5e21)