Update for Special
Revert "Update for Special"

This reverts commit 49623f6d4b8432d3aa60d4a4745f41c556bb7c54.
This time it is really done