I’ve encountered the same issue and while your solution works, the problem now is that my images will be in a wrong format. So i’m hoping a fix is coming soon.
We were trying to roll-out some changes, but the service we use to feature-flag items is causing some hiccups. As soon as we noticed the issue, we have paused the roll-out, so everything should be working as expected right now, and are investigating what went wrong and how to prevent it.