Merge "Revert "Change temp approximations to be accurate"" into main