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

This reverts commit dd5c1c11cb98c921515b16352e559497b5358631.