Revert "More FD integration improvements..."

This reverts commit fe2fb0ded118222c3dd39ceb7627c95b65cd0e13.