Merge "Removes a vestigial code path."