stupid merge conflicts. This was originally with the ICBM api commit but something fucked up. Anyways this should prevent future errors when .java files decide that binaries have changed.