This spec was refactored in CE, but not in EE. This commit modifies the
spec so that it uses the same code as CE.