Revert "complete rewrite. =>1.4"

This reverts commit 327ef6544893d81ab677e67a6789fd6016c0e68b.