Revert "Revert "Experimental performance changes""

This reverts commit dbe2b11d9a63e43e1933b64ccac4715b1bd10243.