Revert "Merge external indexes into master"

This reverts commit 1a0d2b4b80677ddadb524503ad9c84e2f03aade7, reversing
changes made to 5eba6a0795f2278f4ea7747f8b54c858529b5502.
57 files changed