Give Johnny his roles back