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

This reverts commit d1e37788e5bd17d060e9bec61ca8fbfee34bc9d7, reversing
changes made to 230a0996fcb9e39a931c45bfa995ceab92726fab.
Revert 9774949..ee478cd

This rolls back to commit 9774949b26122c29feee17413b392a22f168a8e3.