Reversed some modifications