Revert "Merge origin/master"

This reverts commit e6cb704dd47f3413dc5c0d1fef706709324c2466.