Adding ChaChaVMAC back in