(cherry picked from commit e4af4dc3a6da6da724e7cff18cf5b6da6ef2a3fd) Signed-off-by: Collin Shoop <cshoop@digitalocean.com>