Revert "Merge branch 'feature' of https://github.com/mybb/mybb into feature"

This reverts commit 8fcfb00f6e02e4bb9fea2eaf27c8d51a4c91e674, reversing
changes made to 1e7b8bc088879072b5d6b56256c4b572273986e7.