Fix Tim Pope forked changes lost in merge