The upstream patch has landed, so we don't need this anymore. Change-Id: I08a6705f189b2a24b737ab4f52bb7f449879fdf1