0.3.1.0
Revert 6f14dbb..703a36f

This rolls back to commit 6f14dbb051841d682412cbac2f08eb16ce86ee9a.