ps:CR-183201 revert