Revert 4b94673..2867acb

This rolls back to commit 4b946737f5f54efa26edf3d0d49f32771bf70bf2.
0.2.5.2