Revert "Use dist branch in buildcontrol"

This reverts commit 83245ab1ebfe6c530bb8c0cf74204998120a368b.