* partialy revert r8246; we're working in units of one here, so the number of units...