This looks sensible to me, but I still can't make sense of the old code which just conditionally copied it even after taking a brief look at the pre-git history of this code. Does anyone understand why the code was like this? Fixing code that seems to have had an intention I can't make sense of always feel dangerous.