Reverting back to previous HW to make sure it works