Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 700687ebe07ac8b7a5cf5fd2c4892ea07a827080)