I think I prefer the behavior Sanne proposes. But if I did not add it to 4.1.x or 4.2.
But compared to other issues logged for 4.1.x or 4.2, this did not make the cut.