Change back to return ContentInfo, but more efficiently