Revert "work in progress"

This reverts commit 3b7b189952b1ec8aefcc7b257085312bc8126352.