Revert "YetAnotherForumuser's patch"

This reverts commit f5cbbf4840a690ca7edc33f23ff10f222ff94dfa.