Revert "Merge branch 'master' into next"

This reverts commit e5fa1b4e98213849769c4bbec681d3be1a3d0e92, reversing
changes made to 8635d95bbd299e2c7cb6177d37dc8143c12611e0.