Issue 3297 partial backout take3

This removes the duplicate index but does not add the problematic index