Made specific to niflheim changes. DO NOT MERGE WITH REMOTE
Revert "Made specific to niflheim changes. DO NOT MERGE WITH REMOTE"

This reverts commit ea09d519747942a23519823125b5950e1f9b7ce1.