WFCORE-267 Simpler solution that also lets the existing tests pass without
modification.