Revert the previous commit and reassign radiotray to s-r.