Remove idiotic RowCountOrGenericSubQ - it will never work as part of as_query

I am not sure how I overlooked this, blame is on me :(

Replacing with a ROWCOUNT fallback at the appropriate place