Remove previous change that was unnecesary

Change-Id: I4d2ffee32a895b7951234308aea7744a3adef1e2