Revert c882183..3dd4db3

This rolls back to commit c882183d9af385edc106277b6b406f80903ae1c3.
Revert ab62ef5..f7170f4

This rolls back to commit ab62ef5db6c70626561bebd475cc36eaa387fe21.
Revert 3dd4db3..f144243

This rolls back to commit 3dd4db3dd1fa65e953346e1ab3a51e45f908c8d3.
Refactor AI