Bug 985145 - make node reassignment work correctly with FxA. r=rnewman