Remove dependence on SuspendCompaction and ResumeCompaction