Signed-off-by: Andrew Fyfe <andrew@neptune-one.net> (cherry picked from commit b10271c7)
mentioned in commit a50656ab