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

This reverts commit 83b36534fd37870b309565850aa784f54b5ab976, reversing
changes made to a3a63d5a26470f6d2218956dd36f52087ecbd6a9.