Revert interactive determination

Fix #3505