  
  		if (instance == button)
     	{
-    		button.addEventListener(FlexEvent.BUTTON_DOWN, buttonDownHandler);
+    		// TODO (jszeto) Change this to be mouseDown. Figure out how to not 
+    		// trigger systemManager_mouseDown.
+    		button.addEventListener(FlexEvent.BUTTON_DOWN, button_buttonDownHandler);
     		button.enabled = enabled;
     	}
     }

import flash.ui.Keyboard;

import mx.collections.IList;
import mx.events.CollectionEvent;
import mx.events.DropdownEvent;
import mx.events.FlexEvent;

    {
    	if (instance == button)
    	{
    		button.removeEventListener(FlexEvent.BUTTON_DOWN, button_buttonDownHandler);
    	}
        
        super.partRemoved(partName, instance);
