Revert "Back substitution with free variables"

This reverts commit 5e1a1529731a99f579a4d8e3a25b467fa3f6d022.