I think this mostly fixes automation...  Still need to test some other
aspects of it, but the base functionality is back...