reverted a change because it was wrong

Reverting because it caused a failing test.

Seems I got overly ambitious.