Reverting some unncessary performance improvements that didn't improve performance.