Merge "Revert "Performance regression when hot reloading""