Revert "work in progress"

This reverts commit 11e408c214e5a8b0ce11a46deb4a2e3eb697e908.