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

This reverts commit d692c7a6e442fa81e07d546ecadce027e81520c8.