WIP: Monkey patch around issue #227783.
What does this MR do?
This is a WIP MR to get feedback on the issue #227783 (closed)
Screenshots
See issue
Does this MR meet the acceptance criteria?
None, this isn't production-grade code it's just to get some discussion going around #227783 (closed)