ECMS-4504 revert the check in some places which should not be changed