Pre Draggable-overhaul commit