Repack last commit.
Part of the fix for issue #373 caused ref-test failures.  This fixes that regression.