Nice fix...took several tweaks and tries to make this work. For one thing: the phone allowed me to set the date ahead a year but then immediately changed it to the correct date - even though the automatic update was not checked.
Also, due to some memory issues it took longer than I wanted to...