Fixup the spec to work regardless of which solution we wind up with.

The original spec was focused on the exact fix that was originally put
in place, but we may wind up changing to an alternate fix that
would not be tested by the spec as it was.