Backporting the fix for https://github.com/Particular/NServiceBus/issues/1148 into version v3.3.x