Rolled back a few overzealous fixes.