Removed the new introduced apache collections dependecy again and
replaced the LinkedMap with a linear search (which shouldn't have any
impact for our very few entry we need iterate through).