Revert "Merge branch 'alpha'"

This reverts commit baeb6a0bc92cc769ca091d1b7e1b8e71eed5758d, reversing
changes made to 71dfffacb8a28f1612eaac0add6117c5cc7d692a.