This is in effect a revert of f139ae3d, as we have since gained a more sophisticated way of doing extra IRGen with the addition of RawAddress in #86923.