Apply patch for d.o issue: 1576664.