Moved checkpoint disabling.