Revert some change. Refs #7506_calibrate_mem_leak.