ERP-130

This is to only _delay_ messages until the end of a request.