@lsmith77 do we want to fix this at this time? or should we just find some workaround to merge this PR?