Revert 'fix' that broke the standard where clause