New attempt.

Signed-off-by: Janne Hakonen <janne.hakonen@oss.tieto.com>