20c8b094d6
This fixes the bug exposed in the previous commit.
The tests which exposed it now pass and expected failures
removed.
(cherry picked from commit d89d0e6b74)