Revert "Merge branch 'master' into 3"

This reverts commit 52b7f4869aadf3426dfaad6018a4aa34bd973a92, reversing
changes made to 52d417c23519984f03279e938ec1e7996c78db25.