Revert "Trying to see what happens if I use the apache implementation of the Java escape convention."

This reverts commit e2d46dc882f36fc4a8df38acb278aa543e17350e.