Revert "Tentative optimization"