Reverting npc list locations until further investigation.