Revert to old query