Revert EB-7587 and add change for EB-7890