Recommit r53268 (simetrical) after general revert r54735: Fix bug, werdna not on...