I think the patch is obvious. As it works with 4.2, it is a regression.

The FIXME change is unrelated and small - and obviously only for the trunk.

Build and regtested on x86-64-linux.
OK for the trunk and 4.4? - I can also commit it for 4.3, if deemed useful.

Tobias