Revert optimization which broke compression, see #332