Why not avoid the code duplication with the above one and keep this in the iso8061 method ? (and since we're still using it, remove the deprecate part).