Revert "use by default Autodetect API + cleanup"

This reverts commit 1f9efb7e69c92bd46232f7c32069b8ce363c15a9.