I've had someone raise #474 to revert this behaviour. Do we need this behaviour?