This is the correct version of r174802.