Remove this for now

Change-Id: Ia6a78b96f709740ea3e00a55a60aa7c737ca5d09