Revert c882183..28feb0e

This rolls back to commit c882183d9af385edc106277b6b406f80903ae1c3.
Revert 28feb0e..96f0742

This rolls back to commit 28feb0efbc5a1a4cc0bea257e911f440911864e0.
Refactoring AI