Bug 905208 - WIP some reviewer's request changed