Restore FIRST_CLASS_MESSAGING