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