diff --git a/UPGRADE.asc b/UPGRADE.asc
index ca53af4d42..69fd6c979a 100644
--- a/UPGRADE.asc
+++ b/UPGRADE.asc
@@ -5,6 +5,13 @@ Upgrade Instructions
 
 Please follow these instructions when upgrading from an older Titan release.
 
+Version 1.0.0 (September 21, 2015)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Note that property pre-fetching is disabled by default in Titan 1.0 and future releases. That is, the `fast-property` configuration settings defaults to true. If you are relying on this setting to speed up multi-property access you need to enable `fast-property` explicitly.
+
+
+
 Version 0.9.0-M2 (June 8, 2015)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/configuration/GraphDatabaseConfiguration.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/configuration/GraphDatabaseConfiguration.java
index c39835a1f3..cf388fece5 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/configuration/GraphDatabaseConfiguration.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/configuration/GraphDatabaseConfiguration.java
@@ -223,10 +223,10 @@ public class GraphDatabaseConfiguration {
 
 
     public static final ConfigOption<Boolean> PROPERTY_PREFETCHING = new ConfigOption<Boolean>(QUERY_NS,"fast-property",
-            "Whether to pre-fetch all properties on first vertex property access. This can eliminate backend calls on subsequent" +
+            "Whether to pre-fetch all properties on first singular vertex property access. This can eliminate backend calls on subsequent" +
                     "property access for the same vertex at the expense of retrieving all properties at once. This can be " +
                     "expensive for vertices with many properties",
-            ConfigOption.Type.MASKABLE, Boolean.class);
+            ConfigOption.Type.MASKABLE, false);
 
     public static final ConfigOption<Boolean> ADJUST_LIMIT = new ConfigOption<Boolean>(QUERY_NS,"smart-limit",
             "Whether the query optimizer should try to guess a smart limit for the query to ensure responsiveness in " +
@@ -1567,9 +1567,7 @@ private void preLoadConfiguration() {
                     TX_DIRTY_SIZE_DEFAULT_WITHOUT_BATCH;
         }
 
-        if (configuration.has(PROPERTY_PREFETCHING))
-            propertyPrefetching = configuration.get(PROPERTY_PREFETCHING);
-        else propertyPrefetching = null;
+        propertyPrefetching = configuration.get(PROPERTY_PREFETCHING);
         useMultiQuery = configuration.get(USE_MULTIQUERY);
         adjustQueryLimit = configuration.get(ADJUST_LIMIT);
         allowVertexIdSetting = configuration.get(ALLOW_SETTING_VERTEX_ID);