Partially revert d955f1a0a8bb0a1a1624d93f5a0229f4188671c0.

Now the autoremoval should work until the user personalizes the feature.
The previous thing, while working correctly, was too slow to be handled in low-end machines.
2.0.4
Merge branch 'master' into debian
2.0.4-1