Revert "fix(query): try fix for #533 - refactor"
Revert "fix(query): try fix for #533 - refactor"

This reverts commit 812bdea07f91da06eea544918ce9151728238a39.

devinivy/waterline,Atlantis-Software/waterline,3032441712/waterline,antoniopol06/waterline,luislobo/waterline,metidia/waterline,atiertant/offshore,Atlantis-Software/offshore,contra/waterline,dmarcelino/waterline,particlebanana/waterline,waterlinejs/waterline,AlexisNo/waterline,mmiller42/waterline,balderdashy/waterline,ctartist621/waterline,citizenken/waterline,Zaggen/waterline,moklick/waterline,jianpingw/waterline,listepo/waterline,scippio/waterline,mcanthony/waterline,kriswill/waterline,jonniedeb/waterline,tjwebb/waterline,hippich/waterline