Revert "Revert "Revert "Construct2"""

This reverts commit 252ffdcca18c014d9ddd27cbb52ba579520334eb.