This reverts commit 4483e42e8c. Wasn't supposed to be synced. Upstream patch still pending.
4483e42e8c