Revert "[#514] Trying to fix travis"

This reverts commit c76997363658e1145d936ce435066153ba8ced11.
Revert "[#514] Uses datastore legacy mode when running Postgres 8.4 in Travis"

This reverts commit eceaa7970d77b3c6937a3679fc1dde76ea498af3.