Revert some optimizations to find a possible unreported bug