Revert "HDBITS provider cleanup"

This reverts commit da27a67fa1fbf7269528fcac4c90293b1f8c74b5.