Some things ended up in contrib that really shouldn't have been there.