Fix regression introduced by the fix for Bug 12445.

Bug: 12771