Fix issue 643 using a slightly modified version of the patch provided by
Stuart.

Revision created by MOE tool push_codebase.
MOE_MIGRATION=4270
2 files changed