MDL-25863 backup - take rid of dupe code for filename calculations