Rollback, new implementation needed
Merge branch 'fix/develop/my_contribution' of https://github.com/roycornelissen/NServiceBus into fix/develop/my_contribution