removed double click disable hack for now, should attempt later in another ticket