Undo failed subtree merge 0.9.0

This reverts commit 260cf5c, which appears to be a failed subtree merge, from the 0.9.0 branch.