[MRESOLVER-92] Revert MRESOLVER-7
15 files changed