Fix what !785 (closed) tried to fix, but correctly. Merge !794 (merged) first, since this is based out of the branch from that request.