vchoi_fork

[svn-r17180] In my last round of checkin (r17176), I forgot to clean up some code.  I'm checking in
the fix now.

Tested on jam - simple change.