Actually remove the HsWithBndrs landmine