Bug 959138 - Rework the fix following feedback.