Revert "Another index and related query optimized"

This reverts commit cb2a98959dfa43d1b9a424d33b0a6ecfa468a694.