(I'm going to send this patch upstream.) Change-Id: I1281719ea6cc199f917919d39090cdfc90a05bf5
mentioned in commit 0e7095f3