[AFD]: Revert r42674 and part of r47156