APRS: some optimized code rolled back.