Revert "Merge branch 'master' into stable"

This reverts commit 72871d05f21596ea73a47c0aeb8b1f4bdfe850de, reversing
changes made to c5babff10474297f432ac0f2a4db515a2dd29e19.