Should probably remove for upstream.