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

This reverts commit 9602ca9d7716699c821ce7e0e0495a73af6654d7, reversing
changes made to 98670ee7890ed803d56c6f60aca421ba94f9c4ad.
Merge remote-tracking branch 'origin/master'