213: simplify

Signed-off-by: Martin Stensgård <mastensg@ping.uio.no>