Revert MC/GC (+ instrumentation) to d54ce4a28bdcc5f86f0cb60b75202d62256b0a0c