Revert unintentional changes from master

Due to a rebase that included some changes from master, I unintentionally introduced changes to this 6-stable branch. This merge is to fix that error by reverting the merge commit that introduced this, which is currently the most recent commit in the branch.