Revert "wint-99 Merge"

This reverts commit 60799df791edd91a69b35d2de66df173b0f07db9.