Try to fix breakage caused by patch #1479181, r45850
2 files changed