Created by: germasch
This is just a proof of concept demonstration related to #1384. It's not at all a correct fix that should be merged.
The only meaningful change is in the last commit, and hopefully that demonstrates what I was talking about in the discussion in #1384.