Migrate onto the new java core.