Commit r185909 was a misapplied patch, fix it