Revert "Merge remote branch 'origin/master'"

This reverts commit e98bb1d5c3bd0020450aa5787e56ba89c652790d, reversing
changes made to fe7309ee85ad85d1e5473c59221e7ed2bd1dca6f.