Revert some change. Refs #7506_calibrate_mem_leak.
Merge branch 'feature/7506_calibrate_mem_leak' into develop