Always reset the layer of things removed from storage

Fixes #6470
Merge pull request #6483 from MrPerson/storage_war_hunter_kings

Always reset the layer of things removed from storage