This should happen before returning early. If the original implementation doesn't do that, we should fix it there too.