Backout bug 926746 part 3 (replaced with bug 945334) rs=jesup
Bug 945334: Fix runnable pointer holding r=roc