This change was waiting for privacy to get sorted out, which should be true now that #8215 has landed. Closes #4427