Apply patch #2248475