Revert "Merge pull request #9377 from crdlc/bug-865197"

reverting because of lint errors

This reverts commit 5d150dee984167b06ff521c2b57a72f0d97e0ea9, reversing
changes made to cbea03490518734515b7e6c1508759768342b18c.