Revert "Merge pull request #16831 from sergi/921971-fdn"

This reverts commit cdcc68168c8aaef12a8b4e9137fec83128e6afb9, reversing
changes made to 183c2e102105aa5bc804f7c9c36a840fe2266c52.