Why is this removed as a part of this PR?