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

This reverts commit 79488d3c1fa4ad17766b585227eca47503f25b4a.