rollback to r7