Silly svn. These files didn't get merged over in the merge of the issue8824 branch.