Turning back on reset_data, at least until some of the more major commits are done