Bug 959505 - wip patch.