Poor man's implementation of find_or_create to avoid munging DateTime objects. Updates #161