revert my previous commit and use a conditional for the time format instead which...