JC-1604 ROLLBACK