Revert "Finished Adaptation"

This reverts commit 707f571a05542eede4ee9e93e08106610e36065d.