JAL-3446 fixing a bad merge, sorry