Revert "Merge branch 'branchC' into branchB"

This reverts commit a86d2f12dd9a328b7ca35877d539b002e2d2ee8e, reversing
changes made to d6d83fc418b74494cd6bc64c73f32310f6670abd.