Reverting r107496, r107497