No need to apply the patch for legacy/trac#8405 (moved) to nightlies anymore as it got merged to master.