Revert "Merge pull request #3002 from moberemk/patch-2"

This reverts commit 8e3d6cffb706b7ded3849b5ae9f29515cc610063, reversing
changes made to 92800889a677899fd5c7a82fb7bab2cbfff887a3.