Revert 6c5a09d..583bb49

This rolls back to commit 6c5a09d081a9e8752808b3cf432193f0a85f2aa9.
aoi multi 3