Revert r144611 and r144613.