This reverts commit 6595364227.
* While this does need cleanup, instance specific spells should stay
* grouped together.
This reverts commit 6595364227.
* While this does need cleanup, instance specific spells should stay
* grouped together.