Bug 864484 - 2/2: implementation.