Merge "Restore the up time preference."