Remove return-count check, as said in email discussion