diff --git a/acquia_spi/acquia_spi.module b/acquia_spi/acquia_spi.module
index 20505da..ebd1eff 100644
--- a/acquia_spi/acquia_spi.module
+++ b/acquia_spi/acquia_spi.module
@@ -75,7 +75,8 @@ function acquia_spi_boot() {
   // Determine if the required interval has passed.
   $now = REQUEST_TIME;
   if ((($now - $last) > ($interval * 60))) {
-    acquia_spi_data_store_set(array('server' => $_SERVER));
+    $platform = acquia_spi_get_platform();
+    acquia_spi_data_store_set(array('platform' => $platform));
     variable_set('acquia_spi_boot_last', $now);
   }
 }
@@ -378,9 +379,6 @@ function acquia_spi_update_definition() {
 function acquia_spi_send_full_spi() {
   $spi = acquia_spi_get();
   if ($spi) {
-    if (function_exists('dpm')) {
-      dpm($spi);
-    }
     $result = acquia_spi_send_data($spi);
     // Check result for command to update SPI definition.
     $update_command = isset($result['result']['update_spi_definition']) ? $result['result']['update_spi_definition'] : FALSE;
@@ -427,11 +425,12 @@ function acquia_spi_get() {
   $drupal_version = acquia_spi_get_version_info();
 
   // Default values return
+  $stored = acquia_spi_data_store_get(array('platform'));
   $spi = array(
     'spi_data_version' => ACQUIA_SPI_DATA_VERSION,
     'site_key'        => sha1(drupal_get_private_key()),
     'modules'        => acquia_spi_get_modules(),
-    'platform'       => acquia_spi_get_platform(),
+    'platform'       => !empty($stored['platform']) ? $stored['platform'] : array(),
     'quantum'        => acquia_spi_get_quantum(),
     'system_status'  => acquia_spi_get_system_status(),
     'failed_logins'  => variable_get('acquia_spi_send_watchdog', 1) ? acquia_spi_get_failed_logins() : array(),
@@ -565,8 +564,8 @@ function _acquia_spi_security_review_compatible() {
  *    An array containing some detail about the version
  */
 function acquia_spi_get_version_info() {
-  $store = acquia_spi_data_store_get(array('server'));
-  $server = (!empty($store) && isset($store['server'])) ? $store['server'] : $_SERVER;
+  $store = acquia_spi_data_store_get(array('platform'));
+  $server = (!empty($store) && isset($store['platform'])) ? $store['platform']['php_quantum']['SERVER'] : $_SERVER;
   $ver = array();
 
   $ver['base_version'] = VERSION;
@@ -670,8 +669,8 @@ function acquia_spi_get_settings_permissions() {
  *   True if they are removed, false if they aren't
  */
 function acquia_spi_check_files_present() {
-  $store = acquia_spi_data_store_get(array('server'));
-  $server = (!empty($store) && isset($store['server'])) ? $store['server'] : $_SERVER;
+  $store = acquia_spi_data_store_get(array('platform'));
+  $server = (!empty($store) && isset($store['platform'])) ? $store['platform']['php_quantum']['SERVER'] : $_SERVER;
   $files_exist = FALSE;
   $url = url(NULL, array('absolute' => TRUE));
   $files_to_remove = array('CHANGELOG.txt', 'COPYRIGHT.txt', 'INSTALL.mysql.txt', 'INSTALL.pgsql.txt', 'INSTALL.txt', 'LICENSE.txt',
@@ -951,8 +950,7 @@ function acquia_spi_get_admin_count() {
  *   An associative array keyed by a platform information type.
  */
 function acquia_spi_get_platform() {
-  $store = acquia_spi_data_store_get(array('server'));
-  $server = (!empty($store) && isset($store['server'])) ? $store['server'] : $_SERVER;
+  $server = $_SERVER;
   // Database detection depends on the structure starting with the database
   $db_class = 'DatabaseTasks_' . Database::getConnection()->driver();
   $db_tasks = new $db_class();
@@ -999,8 +997,6 @@ function acquia_spi_get_platform() {
     // php_uname() only accepts one character, so we need to concatenate ourselves.
     'system_version'    => php_uname('r') . ' ' . php_uname('v') . ' ' . php_uname('m') . ' ' . php_uname('n'),
     'mysql'             => (Database::getConnection()->driver() == 'mysql') ? acquia_spi_get_platform_mysql_data() : array(),
-    'server'            => '',
-    'apache'            => '',
   );
 
   // Never send NULL (or FALSE?) - that causes hmac errors.
@@ -1022,7 +1018,6 @@ function acquia_spi_get_platform_mysql_data() {
   // Restore the attribute.
   $connection->setAttribute(PDO::ATTR_CASE, $orig);
 
-  // what happens if we run this on mssql or postgres
   $ret = array();
   if (empty($result)) {
     return $ret;
diff --git a/acquia_spi/tests/acquia_spi.test b/acquia_spi/tests/acquia_spi.test
index eff3535..63e8075 100644
--- a/acquia_spi/tests/acquia_spi.test
+++ b/acquia_spi/tests/acquia_spi.test
@@ -137,7 +137,7 @@ class AcquiaSPITestCase extends DrupalWebTestCase {
       $modules = array('status', 'name', 'version', 'package', 'core', 'project', 'filename', 'module_data');
       $diff = array_diff(array_keys($spi_data['modules'][0]), $modules);
       $this->assertTrue(empty($diff), 'Module elements have expected keys');
-      $platform = array('php', 'webserver_type', 'webserver_version', 'apache_modules', 'php_extensions', 'php_quantum', 'database_type', 'database_version', 'system_type', 'system_version', 'mysql', 'server', 'apache');
+      $platform = array('php', 'webserver_type', 'webserver_version', 'apache_modules', 'php_extensions', 'php_quantum', 'database_type', 'database_version', 'system_type', 'system_version', 'mysql');
       $diff = array_diff(array_keys($spi_data['platform']), $platform);
       $this->assertTrue(empty($diff), 'Platform contains expected keys');
       $this->assertTrue(isset($spi_data['platform']['php_quantum']['SERVER']), 'Global server data included in SPI data');