Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo