It makes sense to look at this and Iedd7a5dca24 together, as this patch itself doesn't really fix anything. Change-Id: Ifef5266b1803d1a96489789b08d9beed044d908f