Changed handlers because of race-condition wheb both 'restart supervisor' and 'restart x' are called, making the roles fail