Revert some of the changes of dc095e7. Wrong use of sizeof