6aa91da74c
This reverts commit 013400bee7.
Reason for revert: Branch is still WIP
Change-Id: I75eec813b3d81049f033fe0a534251bd69eeca0e