NOJIRA fix merge regression
NOJIRA restore dont-convert-timezone behavior removed in merge