Revert "HDM import, merge preparation"

This reverts commit 8c9c7c5330a5c2e9bbb17a919d2b543ebf9fa8a8.