Revert "Merge branch 'master' of github.com:STEllAR-GROUP/hpx into apex_integration"
Latest upstream does not build.

This reverts commit 03390f333721daa2fdc75e82064a37285776dced, reversing
changes made to 2399ad3fa9f1e412263dd45268ad289eccd5575e.