Revert "Merge branch 'stable'"

This reverts commit a70b0291c4d0327e7bca2b63677552734ce734d3, reversing
changes made to 33e2f8f8f97dcc712ac711c1d1ac014d27a32a87.