Resolve logic conflict created at rebase

Signed-off-by: Mattias Andrée <maandree@operamail.com>