Revert "Merge origin/master"

This reverts commit 3966d8445a6f49b0a096c0d9381cb2dc8d3041fb.