I think the "add back model/view_timezone options" is not finished jet.
Instead of "$options['model_timezone'], $options['view_timezone']" there is a lot of "null, null" in the code.

commit 1: 849fb29

commit 2: 0104f15

commit 3: 1c4a75a

Not sure, but commit 3 is correcting commit 1, but not commit 2.