Revert "hv"

This reverts commit ab3024e114504ab3971909794151c107a4f79383, reversing
changes made to 21cb3972c0054249ca57b3f0166042eb2e9e6055.

s