bring back handling of wrappers-uploaded messages

For backwards compatibility in transition.