Kanged from upstream. Let's try again.