reverting previous commit back

Generic class is not needed as changed method is used only in one
occurence