Don't we need the mute until we do #740 though?