Removed cherry-pick that has been merged