Got rid of some of the ones I originally had......bringing them back.

Change-Id: I88ee7388bb27658dbf67438f9bdb7270ffd991c7