Re-apply r109079 with fix.