This seems OK for now. For later I suggest #5817