Merge "Restore non-mangled anchors in API help in all cases"