Bug 887164: WIP