Revert accidentally committed r217107

"Don't treat 0 as a special value for int attributes."