Change return type as per 5d74d94b...