Actually seems like we don't need this at all anymore

Change-Id: I5254b7c3b14acfdaf4e140896b3a59926d0bbabc