More degloblization

Change-Id: If57556243b428faf987ba320d6438528746904e0