Revert 729601c..5dfc16d

This rolls back to commit 729601cf1b7dd018a29d5617a70e5f7009341295.
Revert "Merge branch 'ghost_v0.5.2'"

This reverts commit 729601cf1b7dd018a29d5617a70e5f7009341295, reversing
changes made to 36c7f4c3a4c5d3e4e7e29edc96259a585ee3b559.