Undo collision with r243390.