Revert some of the refactoring. Class attributes are needed in TauModel.