Revert "Merge branch 'develop' of github.com:boostorg/boost into develop"

This reverts commit 20106c50e6c089a69c6b6e124f225903048be395, reversing
changes made to 5a8eff55c2bea0b8e0d1bfe729e3737e0c594b73.

This change was tested locally, but not in the regression testing environment. I'm reverting it until it can be tested in that environment.