This reverts commit a3b50cc1ba. Change-Id: I6db7d00d671556084d4903803c7d180ad7d091ca Fixes: 32598209
a3b50cc1ba