Rollback changes for CMOSD-262, no need to fix this