Merge pull request #21117 from smowton/smowton/admin/revert-java-path…

Merge pull request #21117 from smowton/smowton/admin/revert-java-path… #10513