Revert "NXP-10375 management interface cleanup"

This reverts commit a5777dc022c23a9ef0bd385a56656cdc45ce4a23.