restore to match master on chjj/blessed