Followup fix to the bug Bug 1004630