Merge "Revert "Disable ChangedThrows""