Fix Herald adapter construction for new revisions. Fixes T4572.