Bug 1035763 -- Support 24 hour time format

I'm not clear on why this is needed either. It should just return what it's passed, even if it's a token.