Remove code meant for a different (uncommitted) feature. #3856