Bug 958782 - 2/2: implementation.