Merge "Revert "Revert "Revert "Revert some flaky unloading""""