I had a work around for this, then somehow something was changed with ACF and I had to desperately remove my function (similar to yours posted above) so people could keep uploading images. Once I figure my solution out again, I’ll try to remember to post it here.
This is a big deal that needs to be worked around hopefully in v5, if not, shortly after.
