For reasons that are still unclear, the EE version (but only the EE
version) of this spec was failing reliably, and changing these calls
seemed to resolve it. So we're making the change here for parity.