TARGET_JVM: return flow to the version before revision 80469