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

Revert merge from incorrectly configured remote

This reverts commit 0a55133048c1b706832770b3ce5a78ed15fb8c50, reversing
changes made to 2e73b7157b23c4996de09636239122e323d88c74.