Add r149110 back with a fix for when the vector and the int have the same