Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 186b3a37b60049a572e518bf5d732354cbbd85c7.