Re-reverted DEP-007 merge

Causes stage3 failures on linux-x86 and freebsd-x86.

See the following builds:

https://jenkins.opendylan.org/view/Open%20Dylan/job/opendylan-release-linux-lucid-x86/245/
https://jenkins.opendylan.org/view/Open%20Dylan/job/opendylan-release-linux-lucid-x86_64/244/

This reverts commit 56abbd7ec0f6c21cabe926788a54396f2e13e66b.