Revert "fix"

This reverts commit ec7e9a2ec088073a4ef0f33b1eb9f69f9f4b23b0.
Revert "fix"

This reverts commit 529a5ca72bc5d72c6ff50c0bab89d584dec97736.
Revert "use yaml dump, fucked up in 1.8 but  simpler"

This reverts commit ed12a90be0980dfa835f444bf911689795a0a2e6.