MX-1223, address some CR comments on rollback changes