Revert "Merge branch 'Project-1'"

This reverts commit c0449d38a818a5e83ac70515ad878c35a07b9275, reversing
changes made to b799265e21510d99a936417a67651b65dbeb2ac8.