Revert to 4.1.  Back to commit: "Fix upstream keyer settings"

This reverts commit e882e4a1589ee8ab2b7dda17e7b1b81602886f62.