Revert "Experimental speedup for saving."

This reverts commit 311d7bf851d2c27e65e0f8956155fe2b37ad72a9.