bug 958067 - use ES from master-ball