Some merge conflict, apparently, made me lose my button toggling.  Fixed from commit logs.