revert some drastic performances improvements...