Revert "more work"

This reverts commit e8166a87919e882db272720908f5578f02f02c0a.