Revert "Bring in Xenon support for m7spr.vzw.ul,att..."

This reverts commit 05329b27c5b071e3505be772d5c5dd6a13ce72df.