Partially reverts the ghost type data persisting fix.
Merge branch 'master' of github.com:perfectsense/dari