I removed some calls to an internal Sun API