Lazy fix for RavenDB-1456

As requested in http://issues.hibernatingrhinos.com/issue/RavenDB-1456

Please note that I just lazily reverted some of Pavels changes here. I've no idea if this breaks other stuff or if there's a better way.