Revert "Project NADRA"

This reverts commit 207c12f1424dc398b7fc5f0735702c977c8ef84a.