Removed generics to make failing groovy scripts work.