Revert "Merge branch 'branchC' into branchB"

This reverts commit 692cd129f0b91df4630d781e5f648030eeb97da5, reversing
changes made to 16fdd3a01e7872ffb2a5a371179fbd4cc36852c1.