Revert "Build: 15 Branch: nightshade"

This reverts commit c1a1c6b8c92f2a15d5a9cec44fcdea6dbb235c37.