This reverts commit 281d4f3a.

Please discuss those bugs with me before reverting. If you really need, use -I oldrc instead of this non constructive disabling of new code we desperately need people to test.