* Rollback for implementation #JC-1653