Switch back to many subtypes for binary messages.