For ENG-6042, remove suspect optimization

It looks like there are cases where we aren't returning a result table when we need to, I will make a second pass at the optimization later once master is stabilized.