Roll back to 71785d7 behavior for listing overrides.  Improve efficiency.