diff --git a/WordPress-Docs/ruleset.xml b/WordPress-Docs/ruleset.xml
index 05f0ec87db..00eed4a0ce 100644
--- a/WordPress-Docs/ruleset.xml
+++ b/WordPress-Docs/ruleset.xml
@@ -116,4 +116,7 @@
 		<!-- WP allows @todo's in comments -->
 		<exclude name="Generic.Commenting.Todo.TaskFound"/>
 	</rule>
+
+	<!-- WP disallows `@return void` outside of the default bundled themes -->
+	<rule ref="WordPress.Commenting.FunctionComment.NoReturnVoid"/>
 </ruleset>
diff --git a/WordPress/Sniffs/Commenting/FunctionCommentSniff.php b/WordPress/Sniffs/Commenting/FunctionCommentSniff.php
new file mode 100755
index 0000000000..b8b6389724
--- /dev/null
+++ b/WordPress/Sniffs/Commenting/FunctionCommentSniff.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPress\Sniffs\Commenting;
+
+use WordPress\Sniff;
+use PHP_CodeSniffer_Tokens as Tokens;
+
+/**
+ * Validates function documentation.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.16.0
+ */
+class FunctionCommentSniff extends Sniff {
+
+	/**
+	 * Registers the tokens that this sniff wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register() {
+		return array( T_FUNCTION );
+	}
+
+	/**
+	 * Processes this test when one of its tokens is encountered.
+	 *
+	 * @param int $stackPtr The position of the current token in the stack.
+	 * @return int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
+	 */
+	public function process_token( $stackPtr ) {
+		$commentEnd = $this->phpcsFile->findPrevious(
+			array_merge( Tokens::$methodPrefixes, array( T_WHITESPACE ) ),
+			( $stackPtr - 1 ),
+			null,
+			true
+		);
+
+		if ( T_DOC_COMMENT_CLOSE_TAG !== $this->tokens[ $commentEnd ]['code'] ) {
+			// Invalid function comment. Handled elsewhere.
+			return;
+		}
+
+		$commentStart = $this->tokens[ $commentEnd ]['comment_opener'];
+
+		$this->process_return( $stackPtr, $commentStart );
+	}
+
+	/**
+	 * Process this function's return comment.
+	 *
+	 * @param int $stackPtr     The position of the current token in the stack.
+	 * @param int $commentStart The position in the stack where the comment started.
+	 * @return void
+	 */
+	protected function process_return( $stackPtr, $commentStart ) {
+		$returnTag = null;
+
+		foreach ( $this->tokens[ $commentStart ]['comment_tags'] as $tag ) {
+			if ( '@return' === $this->tokens[ $tag ]['content'] ) {
+				$returnTag = $tag;
+				// Multiple return tags are invalid, but flagged elsewhere.
+				break;
+			}
+		}
+
+		if ( ! $returnTag ) {
+			return;
+		}
+
+		$returnCommentPtr = ( $returnTag + 2 );
+		$returnComment    = $this->tokens[ $returnCommentPtr ];
+
+		if ( empty( $returnComment['content'] ) || T_DOC_COMMENT_STRING !== $returnComment['code'] ) {
+			// Invalid return comment. Handled elsewhere.
+			return;
+		}
+
+		// Extracted from PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting\FunctionCommentSniff::processReturn().
+		preg_match( '`^((?:\|?(?:array\([^\)]*\)|[\\\\a-z0-9\[\]]+))*)( .*)?`i', $returnComment['content'], $commentParts );
+
+		if ( empty( $commentParts[1] ) ) {
+			return;
+		}
+
+		$returnTypes = array_unique( explode( '|', $commentParts[1] ) );
+
+		/*
+		 * Disallow `@return void`.
+		 * See https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/php/#phpdoc-tags.
+		 */
+		if ( array( 'void' ) === $returnTypes ) {
+			$this->phpcsFile->addError(
+				'`@return void` should not be used. Omit the `@return` tag instead',
+				$returnTag,
+				'NoReturnVoid'
+			);
+		}
+	}
+
+}
diff --git a/WordPress/Tests/Commenting/FunctionCommentUnitTest.inc b/WordPress/Tests/Commenting/FunctionCommentUnitTest.inc
new file mode 100755
index 0000000000..d90b88cd8f
--- /dev/null
+++ b/WordPress/Tests/Commenting/FunctionCommentUnitTest.inc
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Function description.
+ *
+ * @return void
+ */
+function with_incorrect_return_void() {
+	echo 'string';
+}
+
+/**
+ * Function description.
+ *
+ * @return void With a comment.
+ */
+function with_incorrect_return_void_with_comment() {
+	echo 'string';
+}
+
+/**
+ * Function description.
+ */
+function with_correct_omitted_return() {
+	echo 'string';
+}
+
+/**
+ * Function description.
+ *
+ * @return string|void
+ */
+function with_correct_return_void() {
+	if ( foo() ) {
+		return 'bar';
+	}
+
+	echo 'baz';
+}
+
+/**
+ * Function description.
+ *
+ * @return string|void With a comment.
+ */
+function with_correct_return_void_with_comment() {
+	if ( foo() ) {
+		return 'bar';
+	}
+
+	echo 'baz';
+}
diff --git a/WordPress/Tests/Commenting/FunctionCommentUnitTest.php b/WordPress/Tests/Commenting/FunctionCommentUnitTest.php
new file mode 100755
index 0000000000..b451a8944c
--- /dev/null
+++ b/WordPress/Tests/Commenting/FunctionCommentUnitTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Unit test class for WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+namespace WordPress\Tests\Commenting;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Unit test class for the NoReturnVoid sniff.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.16.0
+ */
+class FunctionCommentUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList() {
+		return array(
+			5  => 1,
+			14 => 1,
+		);
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList() {
+		return array();
+	}
+
+} // End class.
diff --git a/bin/phpcs.xml b/bin/phpcs.xml
index 89152ebfee..2a27766e55 100644
--- a/bin/phpcs.xml
+++ b/bin/phpcs.xml
@@ -18,7 +18,10 @@
 		<exclude name="WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition"/>
 	</rule>
 
-	<rule ref="WordPress-Docs"/>
+	<rule ref="WordPress-Docs">
+		<!-- https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/pull/1240#issuecomment-348019118 -->
+		<exclude name="WordPress.Commenting.FunctionComment.NoReturnVoid"/>
+	</rule>
 
 	<!-- Enforce PSR1 compatible namespaces. -->
 	<rule ref="PSR1.Classes.ClassDeclaration"/>