Revert "Fix to bug which results in CDR routing not bing generated for Huawei devices"

This reverts commit 6b319f881589b5df6d46c6823519f46e7bb8c039.