Re-apply 105308 with fix.