Merge "Restore code that was removed too aggressively"