Revert "Java improvements from preprocess rewrite"

This reverts commit 47ca3abc4ab47b5cc4ed28ba0ce17c0dc91f7d95.