replicating f25ce64 commit