Revert Zixaphir X, #87