These are the pid-as-solr-field occurences I can find.

Towards #1031. I'll add some inline comments.
You're absolutely right. I'll make a new PR to put it back in, since it looks like this is already merged.