diff --git a/Magento2/Sniffs/Files/LineLengthSniff.php b/Magento2/Sniffs/Files/LineLengthSniff.php
deleted file mode 100644
index f8baefa9..00000000
--- a/Magento2/Sniffs/Files/LineLengthSniff.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento2\Sniffs\Files;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff as FilesLineLengthSniff;
-
-/**
- * Line length sniff which ignores long lines in case they contain strings intended for translation.
- */
-class LineLengthSniff extends FilesLineLengthSniff
-{
-    /**
-     * Having previous line content allows to ignore long lines in case of translations.
-     *
-     * @var string
-     */
-    protected $lastLineContent = '';
-
-    /**
-     * Regular expression for finding a translation in the last line.
-     *
-     * @var string
-     */
-    protected $lastLineRegExp = '~__\(.+\)|\bPhrase\(.+\)~';
-
-    /**
-     * Having the next-to-last line content allows to ignore long lines in case of translations.
-     *
-     * @var string
-     */
-    protected $nextToLastLineContent = '';
-
-    /**
-     * Regular expression for finding a translation in the next-to-last line.
-     *
-     * @var string
-     */
-    protected $nextToLastLineRegexp = '~__\($|\bPhrase\($~';
-
-    /**
-     * @inheritdoc
-     */
-    public $lineLimit = 120;
-
-    /**
-     * @inheritdoc
-     */
-    public $absoluteLineLimit = 120;
-
-    /**
-     * @inheritdoc
-     */
-    protected function checkLineLength($phpcsFile, $tokens, $stackPtr)
-    {
-        /*
-         * The parent sniff checks the length of the previous line, so we have to inspect the previous line instead of
-         * the current one.
-         */
-        if (!$this->doesPreviousLineContainTranslationString()) {
-            parent::checkLineLength($phpcsFile, $tokens, $stackPtr);
-        }
-
-        $this->updateLineBuffer($phpcsFile, $tokens, $stackPtr);
-    }
-
-    /**
-     * Checks whether the previous line is part of a translation.
-     *
-     * The generic line sniff (which we are falling back to if there is no translation) always checks the length of the
-     * last line, so we have to check the last and next-to-last line for translations.
-     *
-     * @return bool
-     */
-    protected function doesPreviousLineContainTranslationString()
-    {
-        $lastLineMatch       = preg_match($this->lastLineRegExp, $this->lastLineContent) !== 0;
-        $nextToLastLineMatch = preg_match($this->nextToLastLineRegexp, $this->nextToLastLineContent) !== 0;
-
-        return $lastLineMatch || $nextToLastLineMatch;
-    }
-
-    /**
-     * Assembles and returns the content for the code line of the provided stack pointer.
-     *
-     * @param File $phpcsFile
-     * @param array $tokens
-     * @param int $stackPtr
-     * @return string
-     */
-    protected function getLineContent(File $phpcsFile, array $tokens, $stackPtr)
-    {
-        $lineContent = '';
-
-        /*
-         * Avoid out of range error at the end of the file
-         */
-        if (!array_key_exists($stackPtr, $tokens)) {
-            return $lineContent;
-        }
-
-        $codeLine = $tokens[$stackPtr]['line'];
-
-        /*
-         * Concatenate the string until we jump to the next line or reach the end of line character.
-         */
-        while (array_key_exists($stackPtr, $tokens) &&
-               $tokens[$stackPtr]['line'] === $codeLine &&
-               $tokens[$stackPtr]['content'] !== $phpcsFile->eolChar) {
-            $lineContent .= $tokens[$stackPtr]['content'];
-            $stackPtr++;
-        }
-
-        return $lineContent;
-    }
-
-    /**
-     * Pre-fills the line buffer for the next iteration.
-     *
-     * @param File $phpcsFile
-     * @param array $tokens
-     * @param int $stackPtr
-     */
-    protected function updateLineBuffer(File $phpcsFile, array $tokens, $stackPtr)
-    {
-        $this->nextToLastLineContent = $this->lastLineContent;
-        $this->lastLineContent       = $this->getLineContent($phpcsFile, $tokens, $stackPtr);
-    }
-}
diff --git a/Magento2/Sniffs/PHP/FinalImplementationSniff.php b/Magento2/Sniffs/PHP/FinalImplementationSniff.php
index 2010e06d..e2ab7b16 100644
--- a/Magento2/Sniffs/PHP/FinalImplementationSniff.php
+++ b/Magento2/Sniffs/PHP/FinalImplementationSniff.php
@@ -27,7 +27,7 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $phpcsFile->addError(
-            // phpcs:ignore Magento2.Files.LineLength.MaxExceeded
+            // phpcs:ignore Generic.Files.LineLength
             'Final keyword is prohibited in Magento. It decreases extensibility and is not compatible with plugins and proxies.',
             $stackPtr,
             'FoundFinal'
diff --git a/Magento2/Sniffs/Security/LanguageConstructSniff.php b/Magento2/Sniffs/Security/LanguageConstructSniff.php
index a0981988..acb71481 100644
--- a/Magento2/Sniffs/Security/LanguageConstructSniff.php
+++ b/Magento2/Sniffs/Security/LanguageConstructSniff.php
@@ -23,7 +23,7 @@ class LanguageConstructSniff implements Sniff
     /**
      * String representation of backtick error.
      *
-     * phpcs:disable Magento2.Files.LineLength.MaxExceeded
+     * phpcs:disable Generic.Files.LineLength
      *
      * @var string
      */
diff --git a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
index fb129097..901419c5 100644
--- a/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
+++ b/Magento2/Sniffs/Strings/ExecutableRegExSniff.php
@@ -17,7 +17,7 @@ class ExecutableRegExSniff implements Sniff
     /**
      * String representation of error.
      *
-     * phpcs:disable Magento2.Files.LineLength.MaxExceeded
+     * phpcs:disable Generic.Files.LineLength
      *
      * @var string
      */
diff --git a/Magento2/Tests/Files/LineLengthUnitTest.inc b/Magento2/Tests/Files/LineLengthUnitTest.inc
deleted file mode 100644
index 6bfd8083..00000000
--- a/Magento2/Tests/Files/LineLengthUnitTest.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-use Magento\Framework\Phrase;
-
-// allowed
-$shortString = 'This is a short line';
-
-// triggers an error
-$tooLongString = 'This is a pretty long line. The code sniffer will report an error if a single line exceeds the maximum character count. You have need to insert a line break to avoid this error.';
-
-// allowed
-$longStringBrokenUp = 'This is a pretty long line. The code sniffer would report an error if this was written as a ' .
-                      'single line. You have to insert a line break to avoid this error.';
-
-// allowed: long lines for translations
-$phraseObjects = [
-    Phrase('This is a short line'),
-    Phrase('Lines which include translations are excluded from this check. You can exceed the maximum character count without receiving a warning or an error.'),
-    'This is no translation string, so let us make sure this throws an error even when we use the word Phrase inside the string',
-    __(
-        'Also if we use this syntax and we put the actual translation string into a new line, there should be no error if this is used in a translation.'
-    ),
-    Phrase(
-        'The same goes for the Phrase class when we put the actual translation string into a new line, also here we should not receive an error.'
-    )
-];
-
-// allowed by Magento Standard (Generic ruleset would trigger warning / error)
-$test = '012344567890123445678901234456789012344567890123445678901234456789';
-$test1 = '01234456789012344567890123445678901234456789012344567890123445678901234456789';
-$test2 = '012344567890123445678901234456789012344567890123445678901234456789012344567890123445678901234456789';
diff --git a/Magento2/Tests/Files/LineLengthUnitTest.php b/Magento2/Tests/Files/LineLengthUnitTest.php
deleted file mode 100644
index 8bbf3da2..00000000
--- a/Magento2/Tests/Files/LineLengthUnitTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright © Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento2\Tests\Files;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-class LineLengthUnitTest extends AbstractSniffUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    public function getErrorList()
-    {
-        return [
-            9 => 1,
-            19 => 1,
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getWarningList()
-    {
-        return [];
-    }
-}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 2ee867db..8898695b 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -172,11 +172,6 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Files.LineLength">
-        <severity>8</severity>
-        <type>warning</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
-    </rule>
     <rule ref="Magento2.NamingConvention.InterfaceName">
         <severity>8</severity>
         <type>warning</type>
@@ -306,6 +301,14 @@
         <severity>6</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Generic.Files.LineLength">
+        <properties>
+            <property name="lineLimit" value="120"/>
+            <property name="absoluteLineLimit" value="0"/>
+        </properties>
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
     <rule ref="Generic.Formatting.DisallowMultipleStatements">
         <severity>6</severity>
         <type>warning</type>
diff --git a/README.md b/README.md
index b5c784a1..f31135c2 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ You can achieve this by adding the following to your project's `composer.json`:
 ````
 "scripts": {
     "post-install-cmd": [
-      "([ $COMPOSER_DEV_MODE -eq 1 ] && vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/) || true"
+      "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/)"
     ],
     "post-update-cmd": [
       "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/)"