See c521add619df for re-addition of this behaviour.