This is the backward compatible version - it might make sense to return an error here as well.