ACF-55: HSA functionality removed
Revert "ACF-55: HSA functionality removed"

This reverts commit b014842feeb6bb62f410d617a3549e35f38120ac.