Revert back to 2.0.2 for now, see issue #32