From: Peter Harliman Liem <pliem@xxxxxxxxxxxxx> commit 49186a7d9e46ff132a0ed9b721ad6b6a58dba6c1 upstream.