Comment 4 for bug 1483866

Re-opening this again, as we are having to revert this change due to exposure of race conditions causing crashes, which not having the changes for this somehow manages to make not happen.