[hotfix][runtime] Cleanup for the temporary fix of FLINK-13063 which is completely...