Rebuild, with enough support for the blocks testsuite.