Cherry-pick from 1.5-maintenance. I've tested to recreate indexes on localhost + reindex. No problem.