Revert "Revert "Revert "Revert "Construct2""""

This reverts commit 8e17d8f5e83d442d33886a9d5b24a95aab2b9997.