Resolve dev/core#931 by not doing translation on the query if field exists during...