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

This reverts commit 0abfcb3af88ac93bf6e1add7b5c872ea3bbc6e6a.