Revert "HeavyCommit"

This reverts commit 623441f8cc55956396ada7493cebacc028713a90.