Merge "Revert "Remove double unloading hack""