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

This reverts commit 7f0ea5207a2ca3e7a58cbd18981f0f8655254e88, reversing
changes made to b2a56d80b8ffff4f7204cf7c73d0291b72124bea.