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