Revert "GLITCH main reverted"

This reverts commit 0f5721913b7a05e007eeb3143b463b350c6435d5.