Removed dependency on Sun's implementation.