Revert "rewrites fix 2 + versioning"

This reverts commit 88f9cf4df1099cad649f4fb184f0a3f71513cd6f.