revert refactoring by resharper