Revert "Merge branch 'branchC' into branchB"

This reverts commit 9d864186bc1c83d6d75e7270f8e2ae3d1fffdb98, reversing
changes made to 1c570b3e0a827019c4350d3b843bc29c5595055f.