Remove hard dependency on behavior bundle