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