Turns out that the compose-keys fix in r9567 did in fact break one