Reverted r81319.