Revert "Resolve merge conflict"

This reverts commit 25d594b3a9a4bb82a48efadad01df8807cccf9bb, reversing
changes made to 541b13c123f39ddd16921518f915efbb21a3c812.
Fix build
Applied https://github.com/linquize/ILSpy/commit/41a4e8b24a21b816673f92d4f22fae3dd763dcf1