Reverted r158538.