Revert "Revert "Revert "This is a combination of 36 commits."""

This reverts commit db4c5101a8e67febb17987b273c151dc26900291.