Performance regression rebuilding resource list?

I'm seeing a long pause during "Rebuilding resource list" using the `master` version - longer than it used to be. I'll try to track it down but I wanted to put this down so I don't forget.