Unmerge bug25552
Merge heads