Revert the 1.8 patch, since it's implicated in nasty blowups (see Pyhon-Dev).