Refs #6550  Eliminated commits to redo

Revert "Merge branch 'feature/6550_OptCrystPos' into develop"

This reverts commit e59d1765743f7d525417128cde2228fb4c22cf2a, reversing
changes made to dee0a70882860d52a1733362df8baa3916d56803.