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