bemhmtl: partially revert previous commit