Every once in awhile the bug crops up again whenever the upstream fix for it breaks. Let's just future-proof it now Change-Id: I31d7e013110c35d35839546f6e2449bef807cbdf
