Continuation of https://github.com/NEventStore/NEventStore/issues/506 because the change should be only made in this package.