Revert "Merge branch 'master' into 1.7"

This reverts commit 109872fdb45dc625906e0039efc0897dd9c64ca5, reversing
changes made to 3d8ec4f62c77fd67882ea32075777b9d01c55864.