Revert "Merge branch 'alpha0.9'"

This reverts commit 8275e8a3e84ae8e097f00bd4e64288805efbd31b.