Revert some chunks of r33133 and r33375: