backport of commit 9c7f4f960e59547a0429f8cf853098d2c070b7f1 Co-authored-by: Derek Menteer <derek.menteer@hashicorp.com>