Revert "Merge branch 'master'"

This reverts commit 64f3b9f67381dc1a04b19856584ed904abfccff4, reversing
changes made to e67b70f2f0287bd627df06ac9bdb38ed7fca8dfb.
delete head