Revert r108794, "Separate PassInfo into two classes: a constructor-free