Undo merge from #0f3d076