RIP Sun Microsystems :'(

Fixes #2006 and replaces #2007.