Revert "Revert "Reconstruction""

This reverts commit aef02f4ad7ed1506127ca5266495334aa185f381.