Revert "Copy change from yet_another_attempt_to_fix_reloading branch".
Revert "Copy change from yet_another_attempt_to_fix_reloading branch".

neo4jrb/neo4j,leviwilson/neo4j,neo4jrb/neo4j,cheerfulstoic/neo4j,leviwilson/neo4j,cheerfulstoic/neo4j