props duck_ see #22855 for trunk git-svn-id: https://develop.svn.wordpress.org/trunk@23203 602fd350-edb4-49c9-b593-d223f7449a82