Revert e93aedbd81 because of gcc 4.1.2