Bring back the detailed update selectors.

This is part 1 of #2545.