Fix a merge problem in 38ea8bed65ef561576472b944534879ae66b80be