Re-added https://github.com/NServiceBus/NServiceBus/commit/bdd47fab813a7c30847906c96e69500b89af756c