Revert r5532, r5536 and a piece of r5531.