Revert part of the reverted commit that we want to keep.