reapply r95206, this time actually delete the code I'm replacing in the third stub...