diff --git a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
index f286b46f9c..1dd3add94d 100644
--- a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
@@ -1,66 +1,72 @@
 <?php
 
 /**
  * Noncritical PHP configuration checks.
  *
  * For critical checks, see @{class:PhabricatorPHPPreflightSetupCheck}.
  */
 final class PhabricatorPHPConfigSetupCheck extends PhabricatorSetupCheck {
 
   public function getDefaultGroup() {
     return self::GROUP_PHP;
   }
 
   protected function executeChecks() {
 
     if (empty($_SERVER['REMOTE_ADDR'])) {
       $doc_href = PhabricatorEnv::getDocLink('Configuring a Preamble Script');
 
       $summary = pht(
         'You likely need to fix your preamble script so '.
         'REMOTE_ADDR is no longer empty.');
 
       $message = pht(
         'No REMOTE_ADDR is available, so Phabricator cannot determine the '.
         'origin address for requests. This will prevent Phabricator from '.
         'performing important security checks. This most often means you '.
         'have a mistake in your preamble script. Consult the documentation '.
         '(%s) and double-check that the script is written correctly.',
         phutil_tag(
           'a',
           array(
             'href' => $doc_href,
             'target' => '_blank',
             ),
           pht('Configuring a Preamble Script')));
 
       $this->newIssue('php.remote_addr')
         ->setName(pht('No REMOTE_ADDR available'))
         ->setSummary($summary)
         ->setMessage($message);
     }
 
-    $raw_post_data = (int)ini_get('always_populate_raw_post_data');
+    if (version_compare(phpversion(), '7', '>=')) {
+      // This option was removed in PHP7.
+      $raw_post_data = -1;
+    } else {
+      $raw_post_data = (int)ini_get('always_populate_raw_post_data');
+    }
+
     if ($raw_post_data != -1) {
       $summary = pht(
         'PHP setting "%s" should be set to "-1" to avoid deprecation '.
         'warnings.',
         'always_populate_raw_post_data');
 
       $message = pht(
         'The "%s" key is set to some value other than "-1" in your PHP '.
         'configuration. This can cause PHP to raise deprecation warnings '.
         'during process startup. Set this option to "-1" to prevent these '.
         'warnings from appearing.',
         'always_populate_raw_post_data');
 
       $this->newIssue('php.always_populate_raw_post_data')
         ->setName(pht('Disable PHP %s', 'always_populate_raw_post_data'))
         ->setSummary($summary)
         ->setMessage($message)
         ->addPHPConfig('always_populate_raw_post_data');
     }
 
   }
 
 }