Reinstate !205053

We need to reinstate !205053 (merged), which was reverted in !205422 (merged). This time, we should fix the column qualifier in the query separately, allow that to go into production, and then merge the rest.