Fixes #320
Well, apparently this actually was the better timezone fix...