Backout 6a5549d97d8d (bug 878935) for missing IID changes.