Merge "Revert "JSR-166 update""