Bug 859764 - 2/2: implementation.