Merge "Revert "Speed up large settings requests."" into main