Revert "resharper code cleanup"

This reverts commit 8122da8319e0ecbe5b1ba804b7abb3da0aa97620.