Patch #1780646 to fix the notices.