revert billing query to version from May 29, 2014 without changes to run type and with yield