Comment 13 for bug 1635181

I've marked the cloud image variation of the same problem as a duplicate of this.

There is also a discussion scheduled for next week to sort out a way forward here.