Revert "Make msftidy happy"

This reverts commit 867eed79579ec8cb4357bf0de3701a62008f3765.