LPS-38357 Replace the last call to persistence in staged model data handlers (Brian, this was the one that broke many tests and you asked me to follow this approach instead)