Reverting 32187, use branch adamed/knife-441 instead.