Comment 3 for bug 1301132

Hmm, there is an issue with the code ... however, I think we may have accidentally changed the default behaviour

In Havana Nova, we would *only* have sent messages via this "envelope" code path if you were using rpc_notifier2

However, in Icehouse, it appears like we're sending using an envelope in all cases except where you're using the original notification format

See the fix for that I've just posted