Merge "Revert "Remove all of the distribution management""