r18702: re-enable non-decimal specification of rid