Revert "venud_hfi: clean up after merge of cm-11.0"

This reverts commit a187f0194587010ad5f5be9c484fcbfa5a21837c.