Revert "Nightfall"

This reverts commit 00727e491531d8a6ac52563f2665a44c71ac8f61.