Add OpenId back to fix broken TC build