Reverted useful changes