Revise previous patch per review.