Revert c8431493be