This is necessitated by the messaging protocol, which again should be changed by issue 45. Removing TODO.