Removing workaround for Enum.java, fixing the root cause of the issue