Revert r205965, which essentially reverts r205018 for the second time.