Don't construct an object we aren't using

Change-Id: Ib4c42171feabf34261434795c1b54171ac017f4d