Revert "Barrows NPC ID Fix"

This reverts commit 25d8722ca55c9f158ebfc072e73790a92dfeefa8.