Revert "Merge branch 'master' of"

This reverts commit 5b118f8c41580d79dfb5707814cac1c628fa2b07, reversing
changes made to 6644942bfd1a3b2214a0497bc7ddaaf6d839fe1d.