Revert "Merge remote branch 'upstream/master'"

This reverts commit dc5ef237adc4f23a2d4d34737c072ddc5cdd7f8f, reversing
changes made to 105e181849be5a9e8ef663c479639266208b68ac.