Why not do that now? Otherwise, when that gets fixed, we might forget to remove these kind of workarounds.