(#2543) - avoid safari storage limit again