Revert "Don't use a load query by default"

This reverts commit d00e70fb228fae39c9e2cd7c0cbb8dc6c86e77c2.

@nickstenning has a better change on the store branch.