Revert "wint-99 more stuff"

This reverts commit f5aeb3c03b04927bdc21fd43ba899b1a364fef92.

wint-99 rolling back changes