Bring in https://github.com/HubSpot/messenger/commit/2eed64644aec05bf27532e4cfc5f6ff6847fcd0e from master (part deux)