Clear up final inelastic use of v1 API. Refs #7469
Revert "Clear up final inelastic use of v1 API. Refs #7469"

This reverts commit 125494dc2116cd153ca1fbe27dfd774d656b1d07.

Turns out it has already been done somewhere else.
Merge branch 'feature/7469_isis_sans_api2' into develop