Move workaround for FC5 copy bug to the common part

See commits 30c21e7a5d3dc9f3895ab8f8df4b06a3cf3c139b
and e10ba105a588291d073ce57f9444d36f1f2f495a
2 files changed