Revert "Merge pull request #14556 from MBRSL/bug-931655-fm"

This reverts commit 1f6e2e53cc2b41e8008a7905c72eb20fc3af52c4, reversing
changes made to 9cfc5da54cc69a8d700f1e5267759878be88fd69.