Backout from 'operations' seperation until IMv7 ready

4 files changed