Revert "Merge branch 'master' into branch1"

This reverts commit 29e5a7765d43ae643d9f9d1e772a983daaa59992, reversing
changes made to 3b1c3442e54af351c37d22821b142048b3f2cdd8.