Comment 2 for bug 1335146

This is blocking all ISO builds, so it should be committed immediately.