Partial revert of '6b71400d6f0fafe8ef95d39bbd10f70665c6d2ab'

Change-Id: I03a45deb164581d12bb2154fbf132113a6496aad
2 files changed