reverting Cody's et-query changes