Revert "Removing logic from distro"

This reverts commit 8e8083384d8fcc66a55e89f824c3fce79eee8080.