Revert "NPC fail"

This reverts commit 88795a9ce046f81554752ab23cf0857730fb7ca9.