Bug 935273: wip patch for testing