Revert "Make index population job not flip during shutdown"

This reverts commit 7edfe46550259adc1f28792ddcade3322e137f0f.