Revert "CHD update"

This reverts commit f6f25e6c0362ee50d1e0ef500099bcfb145cbfef.