add back in HAB changes

Signed-off-by: Stephano Cetola <scetola@reachtech.com>