Revert "fix overriden variables."