We've confirmed that this is an issue and a fix will be coming soon to make this upgrade use the correct item.  If you would prefer to get your Catalyst back and use the Adapter instead, please contact the Support department, explain your situation and refer to WAR-2743409