Initial modifications to support CDH4.