Revert "Merge pull request #5813 from raven02/patch-6"

This reverts commit 7b3828a9ae56cedaa4488fef965935d89e2ac272, reversing
changes made to c724a6c06af75aa09d13375a15ec9ddeeb8622bc.