#4137 undo incorrect commit