Revert "Keep single state across source generation stages"

This reverts commit 29048160614d1fd42309f9abad3c90801060a794.