JAL-437 remove code duplicated by merge