Follow-on patch to r197595 to complete the replacement of truncating divides