Commit df8a1ff redone without breaking stuff. Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
df8a1ff