Revert "Merge pull request #6023 from krautnerds/master"

This reverts commit 9deee73b725aebcdccca0e6fdcb738a9cc4256c1, reversing
changes made to 1965c2b78684e2889a93cb0b9f9bfde5d01e7aa3.