EES-12687, missed some changes.