Besides failing in master, it also fails in 4e0af431 (merge of #1443), but passes in the 1.598-SNAPSHOT parent 239caf89. (cherry picked from commit 33041903)