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