Custom CDC implementation (fix)

Fixed some leftover data, which was accidentally skipped from the last
commit.