Merge "Revert "Remove some remaining mentions of unstubbing from core""