Accommodate interface changes in 35042 and 34926