* Hilariously simpler fix for #6616 Reverts #6648 for a much, much simpler solution, that will actually cover every possible situation automagically.