passing params by setting fields on yourself is just gross

Change-Id: Iee98a9e8e266b56fc886c76eab470ab1ff7ff8e4