Bug 749086: WIP