HIP-835 removing /sys from diagnostics