The features op did make it into OrangeFS 2.9.6 after all. This reverts commit 0c95ad7636.
0c95ad7636