Revert broken pieces of r179373.