Redo r53641, reverted in r55457, now using indexed queries: