This reverts commit f010cb690c49887ba8fc6f925c468b8fa865a4c1. Change-Id: I9e36ddf046eb0ff07fc736da2498e1669c8821f1