Looks like somehow I missed a bunch of files at r1395296. To be sure I will remove all before re-adding all again