This does not belong here, does it? (Part of #855)