Revert "Merge branch 'keep_edges_the_same' into development"

This reverts commit 4f4982961c1f91857fc7b58291627a5a4a2d0e56, reversing
changes made to 1ad8544604b1403251cbb0038e6db3a8a5f8bcad.