Bug 908557 - Remove the affiliated option r=evelyn

https://bugzilla.mozilla.org/show_bug.cgi?id=908557