Revert "Migrating content to full HAL implementation"

This reverts commit 56165dcaceffbb9bfa3f66f9e658f18a81762e23.
Attempting to merge again