So far I've failed to reproduce this outside of our production project and have run out of free time, so I'll leave the override in the settings, and at some point in the future return to the problem. I'll file an issue if I manage to create an example which reproduces the problem.