Reverted "Added Support to CORE -566"