Undo previous changes, declare 2.1.0 support