diff --git a/coder_sniffer/Drupal/Sniffs/Classes/PropertyDeclarationSniff.php b/coder_sniffer/Drupal/Sniffs/Classes/PropertyDeclarationSniff.php
index 67d63e88..d67a119e 100644
--- a/coder_sniffer/Drupal/Sniffs/Classes/PropertyDeclarationSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Classes/PropertyDeclarationSniff.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Verifies that properties are declared correctly.
+ * Verifies that the "var" keyword is not used for class properties.
  *
  * @category PHP
  * @package  PHP_CodeSniffer
@@ -10,106 +10,53 @@
 namespace Drupal\Sniffs\Classes;
 
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
-use PHP_CodeSniffer\Util\Tokens;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
- * Largely copied from
- * \PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\PropertyDeclarationSniff to have a fixer
- * for the var keyword.
+ * Originally this was a fork of the PSR2 PropertyDeclarationSniff to have a fixer
+ * for the var keyword. Since we don't want to maintain all the forked code, this
+ * class was changed to only target the var keyword and provide a fixer for it.
+ *
+ * As a replacement PSR2.Classes.PropertyDeclaration is now included in ruleset.xml.
  *
  * @category PHP
  * @package  PHP_CodeSniffer
  * @link     http://pear.php.net/package/PHP_CodeSniffer
  */
-class PropertyDeclarationSniff extends AbstractVariableSniff
+class PropertyDeclarationSniff implements Sniff
 {
 
 
     /**
-     * Processes the function tokens within the class.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The position where the token was found.
+     * Returns an array of tokens this test wants to listen for.
      *
-     * @return void
+     * @return array<int|string>
      */
-    protected function processMemberVar(File $phpcsFile, $stackPtr)
+    public function register()
     {
-        $tokens = $phpcsFile->getTokens();
-
-        if ($tokens[$stackPtr]['content'][1] === '_') {
-            $error = 'Property name "%s" should not be prefixed with an underscore to indicate visibility';
-            $data  = [$tokens[$stackPtr]['content']];
-            $phpcsFile->addWarning($error, $stackPtr, 'Underscore', $data);
-        }
-
-        // Detect multiple properties defined at the same time. Throw an error
-        // for this, but also only process the first property in the list so we don't
-        // repeat errors.
-        $find = Tokens::$scopeModifiers;
-        $find = array_merge($find, [T_VARIABLE, T_VAR, T_SEMICOLON]);
-        $prev = $phpcsFile->findPrevious($find, ($stackPtr - 1));
-        if ($tokens[$prev]['code'] === T_VARIABLE) {
-            return;
-        }
-
-        if ($tokens[$prev]['code'] === T_VAR) {
-            $error = 'The var keyword must not be used to declare a property';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'VarUsed');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken($prev, 'public');
-            }
-        }
+        return [T_VAR];
 
-        $next = $phpcsFile->findNext([T_VARIABLE, T_SEMICOLON], ($stackPtr + 1));
-        if ($tokens[$next]['code'] === T_VARIABLE) {
-            $error = 'There must not be more than one property declared per statement';
-            $phpcsFile->addError($error, $stackPtr, 'Multiple');
-        }
-
-        $modifier = $phpcsFile->findPrevious(Tokens::$scopeModifiers, $stackPtr);
-        if (($modifier === false) || ($tokens[$modifier]['line'] !== $tokens[$stackPtr]['line'])) {
-            $error = 'Visibility must be declared on property "%s"';
-            $data  = [$tokens[$stackPtr]['content']];
-            $phpcsFile->addError($error, $stackPtr, 'ScopeMissing', $data);
-        }
-
-    }//end processMemberVar()
+    }//end register()
 
 
     /**
-     * Processes normal variables.
+     * Processes this test, when one of its tokens is encountered.
      *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The position where the token was found.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in
+     *                                               the stack passed in $tokens.
      *
      * @return void
      */
-    protected function processVariable(File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
-        /*
-            We don't care about normal variables.
-        */
-
-    }//end processVariable()
-
-
-    /**
-     * Processes variables in double quoted strings.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
-     * @param int                         $stackPtr  The position where the token was found.
-     *
-     * @return void
-     */
-    protected function processVariableInString(File $phpcsFile, $stackPtr)
-    {
-        /*
-            We don't care about normal variables.
-        */
+        $error = 'The var keyword must not be used to declare a property';
+        $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'VarUsed');
+        if ($fix === true) {
+            $phpcsFile->fixer->replaceToken($stackPtr, 'public');
+        }
 
-    }//end processVariableInString()
+    }//end process()
 
 
 }//end class
diff --git a/coder_sniffer/Drupal/ruleset.xml b/coder_sniffer/Drupal/ruleset.xml
index fd3a42b1..1a9fcbab 100644
--- a/coder_sniffer/Drupal/ruleset.xml
+++ b/coder_sniffer/Drupal/ruleset.xml
@@ -68,48 +68,52 @@
   <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
 
   <rule ref="MySource.Debug.DebugCode"/>
+
+  <!-- PEAR sniffs -->
   <rule ref="PEAR.Files.IncludingFile"/>
   <!-- Disable some error messages that we do not want. -->
-  <rule ref="PEAR.Files.IncludingFile.UseIncludeOnce">
-    <severity>0</severity>
-  </rule>
   <rule ref="PEAR.Files.IncludingFile.UseInclude">
     <severity>0</severity>
   </rule>
-  <rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
+  <rule ref="PEAR.Files.IncludingFile.UseIncludeOnce">
     <severity>0</severity>
   </rule>
   <rule ref="PEAR.Files.IncludingFile.UseRequire">
     <severity>0</severity>
   </rule>
-
+  <rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
+    <severity>0</severity>
+  </rule>
   <rule ref="PEAR.Functions.FunctionCallSignature"/>
-  <!-- Disable some error messages that we already cover. -->
-  <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket">
+  <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
     <severity>0</severity>
   </rule>
-  <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket">
+  <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
     <severity>0</severity>
   </rule>
-  <!-- Disable some error messages that we do not want. -->
-  <rule ref="PEAR.Functions.FunctionCallSignature.Indent">
+  <rule ref="PEAR.Functions.FunctionCallSignature.EmptyLine">
     <severity>0</severity>
   </rule>
-  <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
+  <rule ref="PEAR.Functions.FunctionCallSignature.Indent">
     <severity>0</severity>
   </rule>
-  <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
+  <rule ref="PEAR.Functions.FunctionCallSignature.OpeningIndent">
     <severity>0</severity>
   </rule>
-  <rule ref="PEAR.Functions.FunctionCallSignature.EmptyLine">
+  <!-- Disable some error messages that we already cover. -->
+  <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket">
     <severity>0</severity>
   </rule>
-  <rule ref="PEAR.Functions.FunctionCallSignature.OpeningIndent">
+  <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket">
     <severity>0</severity>
   </rule>
-
   <rule ref="PEAR.Functions.ValidDefaultValue"/>
 
+  <!-- PSR-2 sniffs -->
+  <rule ref="PSR2.Classes.PropertyDeclaration">
+     <!-- Already covered by Drupal.Classes.PropertyDeclaration.VarUsed. -->
+    <exclude name="PSR2.Classes.PropertyDeclaration.VarUsed"/>
+  </rule>
   <rule ref="PSR2.Namespaces.NamespaceDeclaration"/>
   <rule ref="PSR2.Namespaces.UseDeclaration"/>
 
diff --git a/tests/Drupal/Classes/PropertyDeclarationUnitTest.php b/tests/Drupal/Classes/PropertyDeclarationUnitTest.php
index dc2d7bfb..23474f58 100644
--- a/tests/Drupal/Classes/PropertyDeclarationUnitTest.php
+++ b/tests/Drupal/Classes/PropertyDeclarationUnitTest.php
@@ -20,7 +20,7 @@ class PropertyDeclarationUnitTest extends CoderSniffUnitTest
      */
     protected function getErrorList(string $testFile): array
     {
-        return [16 => 2];
+        return [16 => 1];
 
     }//end getErrorList()