Revert "bug fixes"

Reverts EventStore/EventStore#335