Revert "Merge branch 'feature-external-heuristic' into develop"

This reverts commit 3683391e81650735e2766a74b9fb2a5e1065c606, reversing
changes made to b3bcbd5531bb9bb188293efe22e934929df5d5c0. I apologize,
the commit was accidental.