Remove unneeded stipping function, should fix #7672