alya.berciu saw a 60% performance drop on some last point queries when we do a rewrite but the proper index is not available.  We should look into whether we can avoid this rewrite when we know it will be harmful.