I can't remember why I commented these lines. Former-commit-id: 3da37915073f94c9c44adfd84c968cb2d70982cf