Revert r206749 till a final decision about the intrinsics is made.