Bug 30650: Take dateformat into account