This was really unreadable for me. I hope it's clearer now. Change-Id: I45d86673ba32dc97dba4b5c5e3c2c576ef1d04ad