16e378b7ad
This behaviour is going to change, and by splitting that change up into two commits the diff makes much more sense.