Great to see all those @deprecated javadocs in your PR :-)