Disable index properly, fixes #5545