Reversed some unintended changes