Resubmission of "Unload Message Pull Request"

Should act the same as #2068 except without any baggage...

@jinpa here's a clean PR...