Revert to 2.1.6, got into some broken dev version issues