Revert "revert previous erroneous commit"
Revert "revert previous erroneous commit"

This reverts commit 69a4b04f08ecfb03ce5ad0133b8d7362ae33538c.

StanfordLegion/legion,StanfordLegion/legion,StanfordLegion/legion,StanfordLegion/legion,StanfordLegion/legion,StanfordLegion/legion,StanfordLegion/legion,StanfordLegion/legion