this isn't our bug, but some people are dumb
Merge branch 'develop'

* develop:
  restore (generic, polymorphic) index