Why were we still tracking this?

Change-Id: I71e53b31fa95959db9c1e12c89607efa6d300c1f

Commit: 117786b3a3a151f18993fefaca6e41f509e3c32e