No need for hack with gonuts/commander anymore.