Revert 6f1cae9 because it caused a lot of troubles...