This reverts commit 2b8795a9db2d494c38d34fd113a9153880a555c0. Change-Id: If8dcc7190cbe66af09945d8b23a3e1d8fd791b1d