Fix gentoo-819774.

I'm not sure if we needed the code that I duplicated but I really don't want to
rock the board anymore with this function. This causes all unit tests to pass
and everthing seems okay now?

Testing Done:
Ran the unit tests with TZ values of empty, `Asia/Kathmandu` and `Pacific/Auckland`.

Reviewed at https://reviews.imfreedom.org/r/1238/