Revert "Remove the message short circuit, doesn't work with installed handlers properly"

This reverts commit fe55ca09c8f67bf2731ef34607eb3f6f1dad2908.