This and the next should stay and should be uncommented after issue 3953 is fixed.