second attempt at patch for #1966
changed names + inlined function
Merge pull request #2243 from Zappaman/tearing_tool

fixes #1966