Revert "work in progress"

This reverts commit 30752d5077722bc0db5e2a520417e9a99bcf0cfc.