MFC r348667:
While working on a PR, more are discovered. Remove more #ifdefs missed in r343701.
Approved by: re (gjb@)