Reverted r123106