This applies back changes which were initially made in !1065 (merged), but occasionally were removed in !1079 (merged)
@schmidtp @kluyvert