Pushed my master branch by mistake. Reverting.

Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 80f8d7d992efb00a04a9378009a5b7fd49d8540d, reversing
changes made to 1b8a31432e82d18a1ae3c38a672fb06a82185247.