This is another case where proper subclassing removes the ability to manually add in exceptions for each new AS type. Actually, a subclass was in existence already, but the lack of the NEW_SERVER_ADAPTER comment made this specific case missed.