Rolled back some unnecessary changes.