revert changes joel made to java files so that they will compile