Bug 914253 patch 10 - Revert inadvertent change from previous commit.  No review.  DONTBUILD