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