Unlike the previous attempt to do this (#14635), this time I'm not
removing anything from the read side, only removing unused code