Revert changes deemed unnecessary