This probably fixes no current issues, because there is another one causing these to be computed unnecessarily.