This reverts bf88f3fe64 until 35813db0f4 in order to move development into a branch, until after the upcoming 6.8 release
bf88f3fe64
35813db0f4