Revert "s,ghost,spirit,g"

This reverts commit d09d99a805ea75a5e195dc4dd5f809edcb5d2bb1.