This reverts commit a40bac52. Reason for revert: wip Change-Id: I6c86f6e9c6d86e8ff1e0904d55bb501f17db7cb1