Pre-CH integration changes.