Partly revert r99083 because the new behaviour is still buggy...