Revert "Revert "Fix HSI""

This reverts commit a0327a0c9d62710dec87d361e4bb56bf07fffc52.