Unmodified copy to ease reviewing follow-up changes. Signed-off-by: Andre Heider <a.heider@gmail.com>