Revert "Merge pull request #6720 from thmo/6-7-stable"

This reverts commit e6707f6f278352d7ca63d9c0a3a3780e6c97be42, reversing
changes made to f88d30fac86b317248dbb47e01b050d9c1edbadf.