Revert "Merge"

This reverts commit 6879aeedae1dd9c7f53a80e28dbf72925d6c7af8.
Revert "HCI v2"

This reverts commit 228591317823f4d4bf520ce829b3fe782b721c59.
Revert "HCI Finished (till UT 1)"

This reverts commit 7f21bdbc09aecc8d394f3b95b2bca464e61a302f.