Merge "Remove double unloading hack"