Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com> (backported from 1639ebcb061abb3664e0b80f62f0019e37fda68e)