I've open a JIRA similar to this one – HHH-11404 Open – and the same fix does both. The test case is still useful.