This reverts commit 5ce9e9ca. Reason for revert: broke build Change-Id: Ia58b5e3ed7d8deede1acdd60e171a37fa96c17e5