Revert "Merge pull request #147 from prezi/java-compatibility-hackery"

This reverts commit e71775526a40b11b2bc4aec49bde9f36763dbee9, reversing
changes made to 6000e3f10a9b16d7739445c40a64f2b0014a5314.