revert the bad distro merge.  rebase could have worked here if I hadn't alread pushed
revert the bad distro merge.  rebase could have worked here if I hadn't alread pushed

kvick/aminator,coryb/aminator,Netflix/aminator,bmoyles/aminator