This reverts commit b2cb324c. Reason for revert: broke host-side test mapping Change-Id: Iea63395d525444421fc27ef5bc660362eba11db0