Revert "Merge pull request #5939 from raven02/patch-18"

This reverts commit cf267abc82c7d98678e4d97d961318fb71f6315d, reversing
changes made to 97c18e7f0ec92fc2a4c61743240ee4e9a8cf264e.