reverted removed HW check