Shims to make deprecation of pytz easier
