We need this in more state and it's inelegant to have the signal connection
magic in more than one place.