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

This reverts commit 335c795930bb6d6312bfac56b21bc186608ba012.