Bug 958782 - 2.b/2: implementation.