Revert "Revised residual variation"

This reverts commit 40abb912e4cafc030c20f21ede7a7970e7267207.