Revert Jasons changes