faster version only exposed on dev for the time being