Revert 10ef222..01b886d

This rolls back to commit 10ef2220c8ee69a909caea176fa81db4f512de10.
Progress to 0.3