MAGEINT-302: reverted the changes