Revert optimizations, since they do actually work afterall.