Revert a change because upstream is fixed.