Revert 431fc0c..61cba0c

This rolls back to commit 431fc0cdfef2fb9a63d40b2058d9a61b5005e5da.
Better safe than sorry, keep reserialization until there are some tests