Revert c9987dd02292d