edit: oh, right, this part of things was removed from the upstream change