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

This reverts commit f1d19ba2be8986942ed19b762b512f33a07c2e77.