Revert "Updated triangle finding"

This reverts commit 7058e6196a7e4c3a6fe2c0a3d0b5db7c56be4318.
Revert "Revert "Updated triangle finding""

This reverts commit a5e0acb5bc5b468ba73f4a80c490261e318a8c60.