It doesn't make sense to have it in 3.x if we don't
have it in master.