diff --git a/src/View/Parsers/ShortcodeParser.php b/src/View/Parsers/ShortcodeParser.php
index a124694e8..c4270ebad 100644
--- a/src/View/Parsers/ShortcodeParser.php
+++ b/src/View/Parsers/ShortcodeParser.php
@@ -689,12 +689,15 @@ class ShortcodeParser extends Object
                 }
 
                 $location = self::INLINE;
+                /**
+                 * Below code disabled due to https://github.com/silverstripe/silverstripe-framework/issues/5987
                 if ($class == 'left' || $class == 'right') {
                     $location = self::BEFORE;
                 }
                 if ($class == 'center' || $class == 'leftAlone') {
                     $location = self::SPLIT;
                 }
+                 */
 
                 if (!$parent) {
                     if ($location !== self::INLINE) {
diff --git a/tests/php/View/Parsers/ShortcodeParserTest.php b/tests/php/View/Parsers/ShortcodeParserTest.php
index 6e6f1fc02..2ec4e22b4 100644
--- a/tests/php/View/Parsers/ShortcodeParserTest.php
+++ b/tests/php/View/Parsers/ShortcodeParserTest.php
@@ -188,6 +188,9 @@ class ShortcodeParserTest extends SapphireTest {
 	}
 
 	public function testtExtract() {
+		$this->markTestSkipped(
+			'Feature disabled due to https://github.com/silverstripe/silverstripe-framework/issues/5987'
+		);
 		// Left extracts to before the current block
 		$this->assertEqualsIgnoringWhitespace(
 			'Code<div>FooBar</div>',