Followup for 8414345
Remove unreleased code