Use unload-feature instead of custom hack.