Revert 12c3efe..34c3933

This rolls back to commit 12c3efe2fff06de0d577b2473068e63b4563ce64.
more tests