Revert r244470 and 244471 while looking into it.