[PATCH 1/2] Actually fix the message dropping commit.