This reverts commit 737629a346e953f5506672834e466acbb06caf39. Change-Id: If3775b57f343094d343991e964faa202748d0236