merge and modification of the rez spell pr.

[jonnyrocket0]

This is a breaking change, so we need to be sure to communicate that clearly.