Merge "Revert "Temporarily disable lazy class-file-load-hook""