Flailing til we stop failing?

Change-Id: I4ae5a447cab6e6a1857d69a1011f48bf02691e5b
Merge "Flailing til we stop failing?" into jb43