Removed dependency on global vars setup by environment.rb.