Revert last change to go through proper review.