Revert "Upgraded to Architect 3.0"

This reverts commit d3f24c49d89948e5f9a7bb6f31737ab96eca4694.

I am issuing this PR because I accidently applied the upgrade commit to the master branch.