Remove a workaround for older montage versions