Remove Fix for ui-gadget-1.