Revert "Merge branch 'master' into deploy"

This reverts commit 6e836be657e4709bdd6ce0d93e048ae70b3d0ab2, reversing
changes made to e4ca58310c782182bfbc731d8045763d2a02076b.