I think it's still a good "quick fix" thing that we can implement fast. We can make it an optional feature that is off by default. Then in a future version we can replace it with a more robust option