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

This reverts commit 0da790252a11c4bd1d1c59f97f044b71a65fa6b3.