Rollback lines 348 and 354