Fix bug 1040780: Use supervisor by default (temporary)