Land #29 h/t @ebidel for updating to core-signals