Why is this commented? I suppose it's a mistake caused by the base branch from 3.2, right?