0dp-P2NFFT: revert last two commits