Back in 2008, when cleaning out unused/undefined stuff, some pieces have been forgotten in commit fb22d4d9. This was accidentially introduced by 68bd7ac1.
Changes v2: